* alloc.c (Fmemory_limit): Cast sbrk's returned value to char *.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f8c21663649d51c1ebbe38dc98ef27309daa747..d62b1e2464b4ee629d7a27066ed63d0594192409 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,6 +10,7 @@
        needed otherwise.
        (CHECK_ALLOCATED): Define only if GC_CHECK_MARKED_OBJECTS.
        (GC_STRING_CHARS): Remove; not used.
+       (Fmemory_limit): Cast sbrk's returned value to char *.
 
        * lisp.h (check_cons_list): Declare if GC_CHECK_CONS_LIST; this
        avoids undefined behavior in theory.

diff --git a/src/alloc.c b/src/alloc.c
index 7fa2790cb1ebd7b77deeb69d28f7c585cc10b0b8..6262e002ed3731cc88cfb068ac8cc2dfb6adab4c 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6057,7 +6057,7 @@ We divide the value by 1024 to make sure it fits in a Lisp integer.  */)
 {
   Lisp_Object end;
 
-  XSETINT (end, (EMACS_INT) sbrk (0) / 1024);
+  XSETINT (end, (EMACS_INT) (char *) sbrk (0) / 1024);
 
   return end;
 }